Changed create_disk_image to default to making "disk.img", which is what

xm-test is looking for by default.

Signed-off-by: Daniel Stekloff <dsteklof@us.ibm.com>

diff --git a/tools/xm-test/ramdisk/Makefile.am b/tools/xm-test/ramdisk/Makefile.am
index 75811dce783cf3570af6929456a8097ee30e84b2..7efeee2aede41af0cb06390208aca19514dea60c 100644 (file)
--- a/tools/xm-test/ramdisk/Makefile.am
+++ b/tools/xm-test/ramdisk/Makefile.am
@@ -45,7 +45,7 @@ initrd.img: $(XMTEST_VER_IMG)
 
 disk.img: $(XMTEST_VER_IMG)
        chmod a+x $(VMX_SCRIPT)
-       $(VMX_SCRIPT) -r $(XMTEST_VER_IMG) -i disk.img
+       $(VMX_SCRIPT) -r $(XMTEST_VER_IMG)
 
 existing:
        @[ -f $(XMTEST_VER_IMG) ] && ln -sf $(XMTEST_VER_IMG) initrd.img || \

diff --git a/tools/xm-test/ramdisk/bin/create_disk_image b/tools/xm-test/ramdisk/bin/create_disk_image
index 0d6ba67791d124b5667898b302e77f81b4137810..dad6d2494b3b9b9229744d9999e35df3f6fbec74 100644 (file)
--- a/tools/xm-test/ramdisk/bin/create_disk_image
+++ b/tools/xm-test/ramdisk/bin/create_disk_image
@@ -77,7 +77,7 @@ function check_dependencies()
 function initialize_globals()
 {
        PROGNAME="create_disk_image"
-       IMAGE="hvm.img"
+       IMAGE="disk.img"
        KERNEL=""
        LCONF="lilo.conf"
        LOOPD=""    # Loop device for entire disk image